From: Peter Michael Green Date: Thu, 3 Jul 2025 23:03:32 +0000 (+0000) Subject: gpsbabel (1.10.0+ds-1+rpi1) trixie-staging; urgency=medium X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~9 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=9f3310bc0b1b96ab4179f08955af64745ed2a2be;p=gpsbabel.git gpsbabel (1.10.0+ds-1+rpi1) trixie-staging; urgency=medium * Remove armhf from qt6-webengine architecture list. [dgit import unpatched gpsbabel 1.10.0+ds-1+rpi1] --- 9f3310bc0b1b96ab4179f08955af64745ed2a2be diff --cc debian/README.Debian index 000000000,000000000..b5d597c92 new file mode 100644 --- /dev/null +++ b/debian/README.Debian @@@ -1,0 -1,0 +1,20 @@@ ++If you are having trouble with your Garmin USB device, the garmin_usb ++kernel module may have grabbed it. ++ ++According to http://www.gpsbabel.org/os/Linux_Hotplug.html, you can ++prevent that by following these instructions: ++ ++According to the documentation at gpsbabel: ++http://www.gpsbabel.org/os/Linux_Hotplug.html ++ ++To keep the OS from loading the (frequently dysfunctional) kernel ++garmin_gps module, edit /etc/modprobe.d/blacklist and add the lines ++ ++# stop garmin_gps serial from loading for USB garmin devices ++blacklist garmin_gps ++ ++To allow the USB devices to be read and written by a non-privileged ++user, create a named /etc/udev/rules.d/51-garmin.rules with the following ++contents: ++ ++SYSFS{idVendor}=="091e", SYSFS{idProduct}=="0003", MODE="666" diff --cc debian/changelog index 000000000,000000000..290119a6a new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,604 @@@ ++gpsbabel (1.10.0+ds-1+rpi1) trixie-staging; urgency=medium ++ ++ * Remove armhf from qt6-webengine architecture list. ++ ++ -- Peter Michael Green Thu, 03 Jul 2025 23:03:32 +0000 ++ ++gpsbabel (1.10.0+ds-1) unstable; urgency=medium ++ ++ * New upstream version ++ * Drop qtci from Files-Excluded (dropped upstream) ++ * Update d/copyright ++ * Update d/patches ++ * Bump policy version (no changes) ++ ++ -- Jochen Sprickerhof Sat, 11 Jan 2025 08:01:10 +0100 ++ ++gpsbabel (1.9.0+ds-3) unstable; urgency=medium ++ ++ * Depend on locales-all for tests ++ ++ -- Jochen Sprickerhof Sat, 08 Jun 2024 14:07:37 +0200 ++ ++gpsbabel (1.9.0+ds-2) unstable; urgency=medium ++ ++ * Fix man page generation ++ * Fix build on 32bit archs ++ ++ -- Jochen Sprickerhof Tue, 24 Oct 2023 16:08:38 +0200 ++ ++gpsbabel (1.9.0+ds-1) unstable; urgency=medium ++ ++ * New upstream version ++ * Update d/copyright ++ * Rebase patches ++ * Switch build system to cmake ++ * Update d/clean (Closes: #1044858) ++ ++ -- Jochen Sprickerhof Mon, 23 Oct 2023 11:27:32 +0200 ++ ++gpsbabel (1.8.0+ds-7) unstable; urgency=medium ++ ++ * Fix package short description (Closes: #1042359) ++ ++ -- Jochen Sprickerhof Thu, 27 Jul 2023 11:10:25 +0200 ++ ++gpsbabel (1.8.0+ds-6) unstable; urgency=medium ++ ++ [ Bas Couwenberg ] ++ * Don't use qtwebengine5-dev on mipsel, package to be removed ++ (Closes: #1041912) ++ ++ [ Jochen Sprickerhof ] ++ * Bump policy version (no changes) ++ * Move package description to source package ++ ++ -- Jochen Sprickerhof Tue, 25 Jul 2023 11:47:33 +0200 ++ ++gpsbabel (1.8.0+ds-5) unstable; urgency=medium ++ ++ [ Debian Janitor ] ++ * Use secure URI in Homepage field. ++ * Set upstream metadata fields: Bug-Database, Bug-Submit. ++ ++ [ Jochen Sprickerhof ] ++ * Add upstream source ++ * Add workaround for failing lconvert (Closes: #1013610) ++ * Bump policy version (no changes) ++ ++ -- Jochen Sprickerhof Sat, 25 Jun 2022 21:49:08 +0200 ++ ++gpsbabel (1.8.0+ds-4) unstable; urgency=medium ++ ++ * Drop gmapbase.html (embedded in gpsbabelfe) ++ * Fix HTML documentation. ++ Thanks to tsteven4 ++ ++ -- Jochen Sprickerhof Tue, 25 Jan 2022 23:19:17 +0100 ++ ++gpsbabel (1.8.0+ds-3) unstable; urgency=medium ++ ++ * Add qttranslations5-l10n to -gui ++ * Add support for Hurd ++ ++ -- Jochen Sprickerhof Mon, 24 Jan 2022 16:09:49 +0100 ++ ++gpsbabel (1.8.0+ds-2) unstable; urgency=medium ++ ++ * Add patch for failing test on i386 ++ * Use Debian build flags for the GUI ++ ++ -- Jochen Sprickerhof Sun, 23 Jan 2022 22:24:45 +0100 ++ ++gpsbabel (1.8.0+ds-1) unstable; urgency=medium ++ ++ * Update Files-Excluded for new upstream version ++ * New upstream version ++ * Rebase patches ++ * Update copyright ++ * Port to qmake ++ * Bump policy versions (no changes) ++ * Update build systems of gpsbabel-gui ++ * Update supported formats ++ * Drop trailing whitespace to please lintian ++ * Add missing build dependency ++ * Support translated gui ++ * Add patch for donation nagging ++ ++ -- Jochen Sprickerhof Sun, 23 Jan 2022 21:25:59 +0100 ++ ++gpsbabel (1.7.0+ds-7) unstable; urgency=medium ++ ++ [ Lisandro Damián Nicanor Pérez Meyer ] ++ * Remove qt5-default from build dependencies (Closes: #972164). ++ - Replace it with qtbase5-dev, which is the appropriate one. ++ - Export QT_SELECT := qt5 to let qtchooser use the right Qt version. ++ ++ -- Jochen Sprickerhof Sat, 17 Oct 2020 12:37:40 +0200 ++ ++gpsbabel (1.7.0+ds-6) unstable; urgency=medium ++ ++ * Set TZ for tests ++ ++ -- Jochen Sprickerhof Tue, 13 Oct 2020 22:39:49 +0200 ++ ++gpsbabel (1.7.0+ds-5) unstable; urgency=medium ++ ++ * Add patch for i386 test failure ++ ++ -- Jochen Sprickerhof Fri, 07 Aug 2020 15:38:18 +0200 ++ ++gpsbabel (1.7.0+ds-4) unstable; urgency=medium ++ ++ * Add patch for endianness issues ++ ++ -- Jochen Sprickerhof Fri, 07 Aug 2020 11:31:04 +0200 ++ ++gpsbabel (1.7.0+ds-3) unstable; urgency=medium ++ ++ * Fix test logic ++ ++ -- Jochen Sprickerhof Fri, 10 Jul 2020 16:13:04 +0200 ++ ++gpsbabel (1.7.0+ds-2) unstable; urgency=medium ++ ++ * Update arch list that ignore test result ++ ++ -- Jochen Sprickerhof Fri, 10 Jul 2020 15:09:25 +0200 ++ ++gpsbabel (1.7.0+ds-1) unstable; urgency=medium ++ ++ * New upstream version ++ * Update file excludes ++ * Update d/copyright ++ * Simplify d/watch ++ * rebase patches ++ * bump debhelper version (no changes) ++ * Depend on libusb-1.0-0-dev (Closes: #810420) ++ ++ -- Jochen Sprickerhof Thu, 09 Jul 2020 21:54:33 +0200 ++ ++gpsbabel (1.6.0+ds-11) unstable; urgency=medium ++ ++ * Add patch for strcmp (Closes: #957304) ++ * bump policy version (no changes) ++ ++ -- Jochen Sprickerhof Tue, 21 Apr 2020 19:40:57 +0200 ++ ++gpsbabel (1.6.0+ds-10) unstable; urgency=medium ++ ++ * [a1fdee8] Install gmapbase.html. ++ Also patch a useful path into gpsbabelfe. (LP: #1015886) ++ ++ -- Bernd Zeimetz Sun, 22 Dec 2019 00:27:08 +0100 ++ ++gpsbabel (1.6.0+ds-9) unstable; urgency=medium ++ ++ * [a1fdee8] Install gmapbase.html. ++ Also patch a useful path into gpsbabelfe. (LP: #1015886) ++ ++ -- Bernd Zeimetz Sat, 21 Dec 2019 23:45:28 +0100 ++ ++gpsbabel (1.6.0+ds-8) unstable; urgency=medium ++ ++ * Add patch for "super gps" ++ Thanks to Tim Connors (Closes: #935373) ++ ++ -- Jochen Sprickerhof Tue, 24 Sep 2019 22:09:09 +0200 ++ ++gpsbabel (1.6.0+ds-7) unstable; urgency=medium ++ ++ * Drop old build dependency ++ * Fix build depends ++ ++ -- Jochen Sprickerhof Tue, 03 Sep 2019 23:46:06 +0200 ++ ++gpsbabel (1.6.0+ds-6) unstable; urgency=medium ++ ++ * Use upstream manpage ++ (Closes: #522332, #618856, #803509, #803512, #698326, #862299) ++ * Drop note about quilt ++ * Add patch for cross compilation. ++ Thanks to Helmut Grohne (Closes: #934849) ++ ++ -- Jochen Sprickerhof Tue, 03 Sep 2019 21:28:10 +0200 ++ ++gpsbabel (1.6.0+ds-5) unstable; urgency=medium ++ ++ * Only override build-arch in d/rules, fixes building on all ++ ++ -- Jochen Sprickerhof Fri, 26 Jul 2019 15:54:26 +0200 ++ ++gpsbabel (1.6.0+ds-4) unstable; urgency=medium ++ ++ * Fix gpsbabel-gui package (Closes: #932875) ++ ++ -- Jochen Sprickerhof Fri, 26 Jul 2019 11:12:00 +0200 ++ ++gpsbabel (1.6.0+ds-3) unstable; urgency=medium ++ ++ * Build pdf on mips again as #580333 was fixed ++ * Ignore test results on some architectures ++ ++ -- Jochen Sprickerhof Fri, 19 Jul 2019 14:08:44 +0200 ++ ++gpsbabel (1.6.0+ds-2) unstable; urgency=medium ++ ++ * Build doc in build-indep ++ ++ -- Jochen Sprickerhof Fri, 19 Jul 2019 00:55:34 +0200 ++ ++gpsbabel (1.6.0+ds-1) unstable; urgency=medium ++ ++ [ Jochen Sprickerhof ] ++ * Cleanup upstream sources ++ * New upstream version (Closes: #805355) ++ * Fix debian/source/format ++ * Add watch file ++ * Rebase patches ++ * Add patches to use system libraries ++ * Port to dh 12 (Closes: #912089) ++ * Update copyright ++ ++ [ Bernd Zeimetz ] ++ * Use gitlab-ci instead of travis ++ * Update Vcs-Git Urls. ++ ++ [ Jochen Sprickerhof ] ++ * Maintainer set to team and add myself as uploader ++ * Bump policy version (no changes) ++ ++ -- Jochen Sprickerhof Thu, 18 Jul 2019 23:32:20 +0200 ++ ++gpsbabel (1.5.4-2) unstable; urgency=medium ++ ++ * [cc58f71] Move git repository to github. ++ * [fb44d98] Add a debian .travis.yml ++ * [28c7ad3] Don't build the gui on [!amd64 arm64 armhf i386 mipsel] ++ The recent qtwebengine is not available on all architectures. ++ Thanks to Adrian Bunk (Closes: #877808) ++ ++ -- Bernd Zeimetz Sat, 21 Oct 2017 13:37:08 +0200 ++ ++gpsbabel (1.5.4-1) unstable; urgency=medium ++ ++ * [ee23f26] Merge branch 'upstream' ++ - New upstream version. ++ - Builds fine with gcc7. ++ Thanks to Adrian Bunk (Closes: #872744) ++ * [f340fb9] Refreshing patches. ++ * [8100370] export QT_SELECT=qt5 ++ * [522c580] Build for/with QT5. ++ Using as build-deps: ++ qtbase5-dev ++ qtwebengine5-dev ++ qttools5-dev-tools ++ Thanks to Dmitry Shachnev (Closes: #816808) ++ * [7d38162] Depend on dh 10 for comapt level 10. ++ * [ada8fa9] Fix building with recent QT5 versions. ++ * [d627435] Use qmake instead of qmake-qt4. ++ * [c08a568] Updating changelog. ++ ++ -- Bernd Zeimetz Mon, 28 Aug 2017 23:53:53 +0200 ++ ++gpsbabel (1.5.3-2) unstable; urgency=medium ++ ++ * [b2954b1] Fix skytraq default values. ++ Taken from upstream ++ Thanks to Jeroen N. Witmond (Closes: #846945) ++ ++ -- Bernd Zeimetz Sun, 01 Jan 2017 22:06:31 +0100 ++ ++gpsbabel (1.5.3-1) unstable; urgency=medium ++ ++ * [41ba336] Merge branch 'upstream' ++ * [9511cf2] removing extra gpsbabel directory from d/rules. ++ * [65959cd] Refreshing patches. ++ * [cd70dc1] ensur emissing minizip .o files are built ++ * [48328e9] Fix help2man call for gpsbabel ++ * [bf2c668] Bump dh compat level to 10. ++ * [ec910a4] Remove gpsbabel/ from some more places. ++ ++ -- Bernd Zeimetz Sun, 27 Nov 2016 16:18:18 +0100 ++ ++gpsbabel (1.5.2-1) unstable; urgency=medium ++ ++ * [fda6f38] Merge branch 'upstream' ++ * [901aac0] Refreshing patches. ++ ++ -- Bernd Zeimetz Sun, 25 Oct 2015 20:36:55 +0100 ++ ++gpsbabel (1.5.0-3) unstable; urgency=medium ++ ++ * [5b27c1cd] Install gpsbabel.html only. ++ Remove php-ized htmldoc folder. ++ The whole documentation is available as pdf anyway. ++ Thanks to Axel Beckert (Closes: #755457) ++ ++ -- Bernd Zeimetz Mon, 04 Aug 2014 16:23:33 +0200 ++ ++gpsbabel (1.5.0-2) unstable; urgency=medium ++ ++ * [d7bbdd34] Add menu and desktop files for gpsbabel-gui. ++ Thanks to Julien Valroff (Closes: #592799) ++ * [c8c9fc34] Ignore make check results for now. ++ Checks fail on various architectures due to endianess/byte ordering ++ issues or due to floating point numbers not being completely equal. ++ * [bd0b02a9] Build-depend on locales-all. ++ make check needs the en_US.UTF8 locale. ++ ++ -- Bernd Zeimetz Wed, 14 May 2014 22:19:45 +0200 ++ ++gpsbabel (1.5.0-1) unstable; urgency=medium ++ ++ * [72ac73df] Support nocheck in DEB_BUILD_OPTIONS. ++ * [3eb772af] Importing upstream version 1.4.4 ++ * [91e94593] Refreshing patches. ++ * [d9a07846] Updating changelog. ++ * [e089d5ab] Merging upstream 1.5.0 ++ * [77258acf] Refreshing patches ++ * [cba6d75d] Create/clean autogen directory. ++ ++ -- Bernd Zeimetz Tue, 13 May 2014 01:19:24 +0200 ++ ++gpsbabel (1.4.3-1) unstable; urgency=low ++ ++ * New upstream release (Closes: #660476) ++ * [0754cb61] Merge branch 'upstream' ++ * [0dc59f07] Merge branch 'upstream' ++ * [337703bb] Refreshing patches. ++ * [6e23bc91] Migrate debian/rules and .install files to gpsbabel subdirectory. ++ ++ -- Bernd Zeimetz Wed, 16 May 2012 23:28:46 +0200 ++ ++gpsbabel (1.4.2-3) unstable; urgency=low ++ ++ * [64bae20c] Use libqtwebkit-dev as build-dependency. (Closes: #629742) ++ ++ -- Bernd Zeimetz Mon, 04 Jul 2011 16:17:13 +0200 ++ ++gpsbabel (1.4.2-2) unstable; urgency=low ++ ++ * [8251cb18] Work around the issues of the sbuild internal resolver. ++ ++ -- Bernd Zeimetz Tue, 15 Feb 2011 11:12:09 +0100 ++ ++gpsbabel (1.4.2-1) unstable; urgency=low ++ ++ * [15f28bac] gpsbabel-gui needs to depend on gpsbabel. ++ Add the missing dependency. ++ * [e5c3f560] Build-depend on libqtwebkit-dev for recent QT versions. ++ * [709bd4d9] Merge branch 'upstream' ++ * [f0e46422] Refreshing patches for new upstream version. ++ ++ -- Bernd Zeimetz Mon, 14 Feb 2011 14:14:26 +0100 ++ ++gpsbabel (1.4.0-1) unstable; urgency=low ++ ++ * New upstream version. ++ * [37a299e3] Merge branch 'upstream' ++ * [01923dca] Removing limited_pointer_type_comparison_fixes patch, ++ applied upstream. ++ * [4d4ea8f8] Refreshing patches. ++ * [f4ef9d52] Add various patches to integrate gpsbabelfe better into ++ Debian. ++ - Submitting statistics data should be opt-in instead of ++ activated by default ++ - Disable check for newer versions. apt-get/aptitude takes care of that. ++ - Disable check for version differences between gpsbabelfe and gpsbabel. ++ The check did not work as expected and dpkg ensures there is ++ no difference. ++ ++ -- Bernd Zeimetz Wed, 23 Jun 2010 01:44:11 +0200 ++ ++gpsbabel (1.3.7~cvs2-3) unstable; urgency=low ++ ++ * [b76106eb] Rename gpsbabel.doc-base parts to stop confusing ++ dh_installdocs. ++ * [0c9397ce] Split documentation into gpsbabel-doc. ++ * [08e7b6ec] Fix build target dependency for build-doc. ++ ++ -- Bernd Zeimetz Thu, 06 May 2010 12:12:41 +0200 ++ ++gpsbabel (1.3.7~cvs2-2) unstable; urgency=low ++ ++ * [014dfaaa] Use $(QUILT_STAMPFN) instead of patch as dependency. This ++ avoids running configure twice. ++ * [75bd04e0] Require make check to succeed for a successful build. ++ * [fe9c247b] Better dependencies for the install target. ++ * [9a028647] Remove build-dependencies on texlive. The tex based ++ documentation is not being built anymore. ++ * [182c909d] Fix various comparison errors due to limited pointer ++ types. ++ * [f6d8e680] Use -ffloat-store on i386. ++ * [760285e1] Do not build gpsbabel.pdf on mips as fop is broken there. ++ ++ -- Bernd Zeimetz Thu, 06 May 2010 00:31:46 +0200 ++ ++gpsbabel (1.3.7~cvs2-1) unstable; urgency=low ++ ++ * Updating to CVS HEAD of today. ++ * [09ce2bac] Build pdf file again, for works fine now. ++ * [3542f981] Require dh 7 for compat level 7. ++ * [5f340180] Do some housekeeping in debian/rules. ++ * [fd477016] Merge branch 'upstream' ++ * [5f1d5231] Clean gui/setup.iss after build. ++ * [56dd1e9b] Rename htmldoc directory and change the references to it. ++ * [05194507] Install docs only into the gpsbabel package. ++ * [e932db97] Build a manpage for gpsbabel using help2man. ++ * [dd121ff7] Merge remote branch 'origin/upstream-cvs' ++ * [475d34c2] gpsbabel is reuired to build the manpage. Add a proper ++ dependency to the target. ++ * [74b24bde] Don't call clean in doc, not built anymore. ++ * [90bb4cc5] Add AUTHORS file to docs. ++ * [a807b146] Install gpsbabel.pdf to /usr/share/doc/gpsbabel. ++ * [d65fa27d] Move doc production into its own target. ++ * [8e6e25a7] Delete all automatically generated and left over files. ++ * [851f5a32] Use source format 1.0 for easy backporting. ++ * [788292c2] Bump Standards-Version to 3.8.4 - no changes needed. ++ * [db9f500a] Add doc-base information for gpsbabel. ++ ++ -- Bernd Zeimetz Wed, 05 May 2010 00:25:48 +0200 ++ ++gpsbabel (1.3.7~cvs1-1) unstable; urgency=low ++ ++ * Updating to CVS HEAD of today. ++ * [4d21a068] Drop Debian's gpsbabel manapge. ++ * [a350b9f6] Update patches for current gpsbabel beta. ++ * [0516a23a] Bump debhelper compat level to 7. ++ * [f964f0e2] Do no require make check to pass for a successful build. ++ * [f2f46177] Add install file for gpsbabel gui. ++ * [1ce3dba8] Don't call makeextras.mak, the file is gone. ++ * [f590f252] Add patch to rename the gpsbabelfe binary. ++ * [e686c93a] Add fop as build-dependency to build the documentation. ++ * [1bcda881] Update debian/copyright file. ++ ++ -- Bernd Zeimetz Mon, 26 Apr 2010 14:24:21 +0200 ++ ++gpsbabel (1.3.6+cvs1-1) experimental; urgency=low ++ ++ * Updating to latest CVS head ++ (c0af31ca669e2ea66ad33a27f23f0efffef2c948). ++ ++ -- Bernd Zeimetz Tue, 07 Apr 2009 18:06:49 +0200 ++ ++gpsbabel (1.3.6-3) unstable; urgency=low ++ ++ * debian/patches: ++ - Adding 'osm-char-int-cast-bug-fix' patch to remove an unneeded ++ cast from int to char and back to int which resulted in a broken ++ osm module on some architectures. ++ ++ -- Bernd Zeimetz Wed, 07 Jan 2009 16:12:17 +0100 ++ ++gpsbabel (1.3.6-2) unstable; urgency=low ++ ++ * debian/rules: ++ - Enable 'make doc' again, it was accidentally left disabled. ++ ++ -- Bernd Zeimetz Wed, 07 Jan 2009 00:05:46 +0100 ++ ++gpsbabel (1.3.6-1) unstable; urgency=low ++ ++ * Imported Upstream version 1.3.6 ++ * Dropping Debian specific patches which were applied to the source ++ directly. They should not be needed anymore. ++ * debian/rules: ++ - Cleaning up unused lines. ++ - Don't ignore make check failures. ++ * debian/control: ++ - Setting myself as maintainer in agreement with John Goerzen. ++ Thanks to John for maintaining the package until now! ++ - Updating Vcs fields to reflect the new location of the git ++ repository. ++ - Bumping Standards-Version to 3.8.0 - no changes needed. ++ - Adding libpaper-dev as Build-Dependency as an appropriate ++ dependency is missing in docbook-xsl. ++ - Adding quilt Build-Dep to handle patches. ++ * debian/dirs: dropping file, not needed anymore. ++ * debian/patches: ++ - Adding patch to stop building gpsbabel.pdf as fop is not in main. ++ * debian/README.source: ++ - Adding file to describe the use of quilt. ++ * debian/watch: ++ - Dropping file, author doesn't provide useful download pages anymore. ++ ++ -- Bernd Zeimetz Tue, 06 Jan 2009 16:12:28 +0100 ++ ++gpsbabel (1.3.5-1.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Fixing FTBFS (Closes: #491364) ++ * debian/control: ++ - adding autoconf and autotools-dev as build dependencies as ++ Package falied to build from source (Closes: #491364) ++ * debian/rules: ++ - Copying config.sub/guess from autotools-dev ++ - Don't ignore errors on clean, fixing a lintian warning. ++ ++ -- Bernd Zeimetz Sun, 20 Jul 2008 21:36:20 +0200 ++ ++gpsbabel (1.3.5-1) unstable; urgency=low ++ ++ * New upstream release. Closes: #480449. ++ ++ -- John Goerzen Wed, 16 Jul 2008 13:04:50 -0500 ++ ++gpsbabel (1.3.4-2) unstable; urgency=low ++ ++ * Add Homepage and Vcs-* lines to Debian/control. ++ ++ -- John Goerzen Sun, 02 Mar 2008 08:52:21 -0600 ++ ++gpsbabel (1.3.4-1) unstable; urgency=low ++ ++ * New upstream release. Closes: #459234. Upstream has dropped ++ Coldsync. Closes: #421769. ++ * Update debian/copyright. ++ * Add garmin_usb info to README.Debian. Closes: #344702. ++ ++ -- John Goerzen Thu, 14 Feb 2008 05:50:31 -0600 ++ ++gpsbabel (1.3.3-2) unstable; urgency=low ++ ++ * Added build-dep on texlive-base. Closes: #427620. ++ * Fixed path of binary. Closes: #427365. ++ ++ -- John Goerzen Tue, 05 Jun 2007 01:48:37 -0500 ++ ++gpsbabel (1.3.3-1) unstable; urgency=low ++ ++ * New upstream release. Closes: #330416, #419884. ++ * Added manpage for Joaquim Ortega-Cerda. Closes: #342324. ++ * Fixed typo in debian/copyright. Closes: #421769. ++ ++ -- John Goerzen Fri, 01 Jun 2007 02:28:54 -0500 ++ ++gpsbabel (1.3.2-2) unstable; urgency=high ++ ++ * Fix doc generation. Closes: #403092. ++ ++ -- John Goerzen Mon, 18 Dec 2006 05:53:16 -0600 ++ ++gpsbabel (1.3.2-1) unstable; urgency=low ++ ++ * New upstream version. Closes: #383899, #380533, #304178. ++ * Style docs now included. Closes: #348986. (Note: README.style ++ no longer exists) ++ ++ -- John Goerzen Fri, 17 Nov 2006 03:57:30 -0600 ++ ++gpsbabel (1.2.7-1) unstable; urgency=low ++ ++ * New upstream version. Closes: #317559. ++ ++ -- John Goerzen Tue, 11 Oct 2005 05:31:39 -0500 ++ ++gpsbabel (1.2.5+1.2.6-beta20050608-1) unstable; urgency=low ++ ++ * New usptream version. Closes: #315227. ++ * New version includes support for USB. Closes: #315134. ++ * New upstream version already has patch for my_rd_deinit. ++ Closes: #315164. ++ ++ -- John Goerzen Tue, 21 Jun 2005 05:59:58 -0500 ++ ++gpsbabel (1.2.4-2) unstable; urgency=low ++ ++ * make check failure no longer causes build failure. There are apparently ++ a lot of minor differences in rounding on different archs that were ++ causing this. Closes: #294717. ++ ++ -- John Goerzen Mon, 14 Mar 2005 10:39:57 -0600 ++ ++gpsbabel (1.2.4-1) unstable; urgency=low ++ ++ * New upstream release. Closes: #291544. ++ ++ -- John Goerzen Thu, 27 Jan 2005 11:08:20 -0600 ++ ++gpsbabel (1.2.3-1) unstable; urgency=low ++ ++ * Initial Release. Closes: #270812. ++ ++ -- John Goerzen Thu, 9 Sep 2004 08:14:00 -0500 diff --cc debian/clean index 000000000,000000000..eb6a31a28 new file mode 100644 --- /dev/null +++ b/debian/clean @@@ -1,0 -1,0 +1,4 @@@ ++debian/gpsbabel.1 ++debian/gpsbabel.xpm ++xmldoc/formats/options/xcsv-utc.xml ++xmldoc/autogen/ diff --cc debian/control index 000000000,000000000..48f632b5e new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,80 @@@ ++Source: gpsbabel ++Section: utils ++Priority: optional ++Maintainer: Debian GPS team ++Uploaders: Bernd Zeimetz , Jochen Sprickerhof ++Build-Depends: debhelper-compat (= 13), ++ cmake, ++ pkgconf, ++ libexpat1-dev, expat, ++ libxml2-utils, ++ libusb-1.0-0-dev, zlib1g-dev, ++ libshp-dev, ++ locales-all , ++ qt6-5compat-dev, ++ qt6-base-dev, ++ qt6-serialport-dev, ++ qt6-tools-dev, ++ qt6-translations-l10n, ++ qt6-webengine-dev [amd64 arm64 i386], ++ imagemagick, ++ xsltproc, ++ docbook-xsl ++Build-Depends-Indep: fop, docbook-xml ++Standards-Version: 4.7.0 ++Rules-Requires-Root: no ++Homepage: https://www.gpsbabel.org/ ++Vcs-Git: https://salsa.debian.org/debian-gps-team/pkg-gpsbabel.git ++Vcs-Browser: https://salsa.debian.org/debian-gps-team/pkg-gpsbabel ++Description: GPS file conversion plus transfer to/from GPS units ++ GPSBabel converts waypoints, tracks, and routes from one format to ++ another, whether that format is a common mapping format like Delorme, ++ Streets and Trips, or even a serial upload or download to a GPS unit ++ such as those from Garmin and Magellan. ++ ++Package: gpsbabel ++Architecture: any ++Recommends: gpsbabel-doc ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Description: ${source:Synopsis} ++ ${source:Extended-Description} ++ . ++ GPSBabel supports dozens of data formats and will be useful for tasks ++ such as geocaching, mapping, and converting from one GPS unit to another. ++ Among the interesting formats it supports are several GPS devices via ++ a serial link, various PDA-based mapping programs, and various ++ Geocaching data formats. ++ . ++ Among others GPSBabel supports the following formats: ++ . ++ CSV, Custom CSV DNA, EasyGPS Binary, Fugawi, Garmin serial, Geocaching.com ++ loc, GPSDrive, GPX, Holux, IGC, Magellan serial, Magellan SD, Mapopolis.Com ++ Mapconverter, Mapsource, Maptech, Microsoft Streets and Trips, NIMA/GNIS ++ Geographic Names, NMEA sentences, OziExplorer, Tab-separated data, Topo by ++ National Geographic, xcsv ++ ++Package: gpsbabel-doc ++Architecture: all ++Multi-Arch: foreign ++Section: doc ++Depends: ${misc:Depends} ++Suggests: gpsbabel, pdf-viewer | www-browser ++Description: ${source:Synopsis} - documentation ++ ${source:Extended-Description} ++ . ++ GPSBabel supports dozens of data formats and will be useful for tasks ++ such as geocaching, mapping, and converting from one GPS unit to another. ++ Among the interesting formats it supports are several GPS devices via ++ a serial link, various PDA-based mapping programs, and various ++ Geocaching data formats. ++ . ++ This package contains the detailed documentation of gpsbabel. ++ ++Package: gpsbabel-gui ++Architecture: any ++Depends: ${shlibs:Depends}, ${misc:Depends}, gpsbabel (= ${binary:Version}), gpsbabel-doc (= ${source:Version}) ++Recommends: qttranslations5-l10n ++Description: ${source:Synopsis} - GUI ++ ${source:Extended-Description} ++ . ++ This package contains gpsbabelfe, a QT based frontend for gpsbabel. diff --cc debian/copyright index 000000000,000000000..2d2869055 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,134 @@@ ++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Source: https://github.com/gpsbabel/gpsbabel ++Files-Excluded: deprecated/gui/serial_mac.cc ++ mac ++ shapelib ++ tools/uploadtool ++ zlib ++Comment: serial_mac, mac, uploadtool: unused ++ shapelib, zlib: packaged in Debian ++ ++Files: * ++Copyright: 2002, Alex Mottram ++ 2008, Alexander Stapff ++ 2008, Andreas Grimme ++ 2006, Andy Armstrong ++ 2008, Björn Augustsson ++ 2004, Chris Jones ++ 2009, Chris Tracy ++ 2006, Curtis E. Mills ++ 2008, Dr. Jrgen Neumann ++ 2008, Dustin Johnson ++ 2009, Erez Zuler ++ 2010, Eriks Zelenka ++ 2005-2006, Etienne Tasse ++ 2011, Fernando Arbeiza ++ 2005, Fredie Kern ++ 2014, Gleb Smirnoff, glebius @t FreeBSD d.t org ++ 2012, Guilhem Bonnefille ++ 2007, Gunar Megger <0xff@quantentunnel.de> ++ 2005, Gustavo Niemeyer ++ 2014, Jean-Claude Repetto ++ 2007, Jeremy Ehrhardt ++ 2012, Jeremy Mortis ++ 2014, Jim Keeler ++ 2002, Jochen Becker ++ 2003, Mark Bradley ++ 2019, Martin Buck ++ 2008-2019, Mathias Adam ++ 2010, Michael von Glasow, michael @t vonglasow d.t com ++ 2007, Mirko Parthey ++ 2012, Nicolas Boullis ++ 2005-2008, Olaf Klein ++ 2011, Paul Brook ++ 2009, Paul Cornett ++ 1998, Paul J. Lucas ++ 2002, Paul Tomblin ++ 2007, Per Borgentun ++ 2020, Pierre Bernard ++ 2014-2020, Ralf Horstmann ++ 2003, Rick Richardson ++ 2001-2024, Robert Lipe ++ 2008, Rodney Lorrimar ++ 2003-2014, Ronald L. Parker ++ 2004, Scott Brynen ++ 2005, Steve Chamberlin ++ 2009, Tal Benavidor ++ 2009, Tobias Kretschmar ++ 2005, Tobias Minich ++ 2007, Tom Hughes ++ 2023, Tyler MacDonald ++ 2014, Zingo Andersen ++ 2012-2016, Zingo Andersen ++ 2009, jekaeff ++ 2013, xiao jian cheng ++ 2007, Mark McClure ++ 2009, S. Khai Mong ++License: GPL-2+ ++ ++Files: jeeps/gpsapp.cc ++ jeeps/gpscom.cc ++ jeeps/gpsfmt.cc ++ jeeps/gpsmath.cc ++ jeeps/gpsmem.cc ++ jeeps/gpsproj.cc ++ jeeps/gpsprot.cc ++ jeeps/gpsread.cc ++ jeeps/gpsrqst.cc ++ jeeps/gpssend.cc ++ jeeps/gpsserial.cc ++ jeeps/gpsutil.cc ++Copyright: 2007, Achim Schumacher ++ 1999-2000, Alan Bleasby ++ 2010, Martin Buck ++ 2004-2006, Robert Lipe ++License: GPL-2+ ++ ++Files: strptime/strptime.h ++Copyright: 1989-1991, Free Software Foundation, Inc ++ 1998, Gerald Combs ++License: GPL-2+ ++ ++Files: strptime/strptime_l.c ++Copyright: 1991-2023, Free Software Foundation, Inc ++License: LGPL-2.1+ ++ ++Files: deprecated/queue.h ++Copyright: 2002-2005, Robert Lipe ++ 2001, Simon Tatham ++License: Expat or GPL-2+ ++ ++Files: debian/* ++License: GPL-2+ ++Copyright: 2004-2008, John Goerzen ++ 208-2017, Bernd Zeimetz ++ 2019, Jochen Sprickerhof ++ ++License: Expat ++ Permission is hereby granted, free of charge, to any person obtaining ++ a copy of this software and associated documentation files (the ++ "Software"), to deal in the Software without restriction, including ++ without limitation the rights to use, copy, modify, merge, publish, ++ distribute, sublicense, and/or sell copies of the Software, and to ++ permit persons to whom the Software is furnished to do so, subject to ++ the following conditions: ++ . ++ The above copyright notice and this permission notice shall be ++ included in all copies or substantial portions of the Software. ++ . ++ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. ++ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ++ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ++ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++License: GPL-2+ ++ On Debian GNU/Linux systems, the complete text of the GNU General ++ Public License version 2 can be found in ++ `/usr/share/common-licenses/GPL-2'. ++ ++License: LGPL-2.1+ ++ On Debian systems, the complete text of the GNU Lesser General Public ++ License version 2 can be found in /usr/share/common-licenses/LGPL-2.1. diff --cc debian/gpsbabel-doc.doc-base index 000000000,000000000..bdf0abfc8 new file mode 100644 --- /dev/null +++ b/debian/gpsbabel-doc.doc-base @@@ -1,0 -1,0 +1,10 @@@ ++Document: gpsbabel ++Title: gpsbabel filter and format documentation ++Section: Science/Geoscience ++ ++Format: HTML ++Files: /usr/share/doc/gpsbabel/html/ ++Index: /usr/share/doc/gpsbabel/html/index.html ++ ++Format: PDF ++Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz diff --cc debian/gpsbabel-doc.docs index 000000000,000000000..627bd53c2 new file mode 100644 --- /dev/null +++ b/debian/gpsbabel-doc.docs @@@ -1,0 -1,0 +1,2 @@@ ++obj-${DEB_HOST_GNU_TYPE}/html/ ++obj-${DEB_HOST_GNU_TYPE}/gpsbabel.pdf diff --cc debian/gpsbabel-doc.links index 000000000,000000000..0a5be16cb new file mode 100644 --- /dev/null +++ b/debian/gpsbabel-doc.links @@@ -1,0 -1,0 +1,1 @@@ ++usr/share/doc/gpsbabel usr/share/doc/gpsbabel-doc/doc diff --cc debian/gpsbabel-gui.install index 000000000,000000000..5c409b202 new file mode 100644 --- /dev/null +++ b/debian/gpsbabel-gui.install @@@ -1,0 -1,0 +1,3 @@@ ++obj-${DEB_HOST_GNU_TYPE}/gui/GPSBabelFE/gpsbabelfe /usr/bin ++debian/gpsbabel.xpm /usr/share/pixmaps ++gui/gpsbabel.desktop /usr/share/applications diff --cc debian/gpsbabel.docs index 000000000,000000000..5734f6236 new file mode 100644 --- /dev/null +++ b/debian/gpsbabel.docs @@@ -1,0 -1,0 +1,2 @@@ ++README.* ++AUTHORS diff --cc debian/gpsbabel.install index 000000000,000000000..5514aa062 new file mode 100644 --- /dev/null +++ b/debian/gpsbabel.install @@@ -1,0 -1,0 +1,1 @@@ ++obj-${DEB_HOST_GNU_TYPE}/gpsbabel usr/bin diff --cc debian/gpsbabel.manpages index 000000000,000000000..d4c44bef8 new file mode 100644 --- /dev/null +++ b/debian/gpsbabel.manpages @@@ -1,0 -1,0 +1,1 @@@ ++debian/gpsbabel.1 diff --cc debian/patches/0007-Add-workaround-for-failing-test-on-i386.patch index 000000000,000000000..97f9d8d7a new file mode 100644 --- /dev/null +++ b/debian/patches/0007-Add-workaround-for-failing-test-on-i386.patch @@@ -1,0 -1,0 +1,19 @@@ ++From: Jochen Sprickerhof ++Date: Sun, 23 Jan 2022 22:22:53 +0100 ++Subject: Add workaround for failing test on i386 ++ ++--- ++ testo.d/nmea.test | 2 ++ ++ 1 file changed, 2 insertions(+) ++ ++diff --git a/testo.d/nmea.test b/testo.d/nmea.test ++index 01b0485..85ae886 100644 ++--- a/testo.d/nmea.test +++++ b/testo.d/nmea.test ++@@ -42,4 +42,6 @@ compare ${REFERENCE}/track/addmultipledays.csv ${TMPDIR}/addmultipledaysmid.csv ++ ++ # test date time parsing ++ gpsbabel -t -i nmea -f ${REFERENCE}/track/nmeadatetime.nmea -o unicsv,utc=0 -F ${TMPDIR}/nmeadatetime.csv +++# workaround rounding on i386 +++sed -i 's/445528/445529/' ${TMPDIR}/nmeadatetime.csv ++ compare ${REFERENCE}/track/nmeadatetime.csv ${TMPDIR}/nmeadatetime.csv diff --cc debian/patches/0008-Ignore-test-failures-due-to-CPU-differences.patch index 000000000,000000000..00c80b975 new file mode 100644 --- /dev/null +++ b/debian/patches/0008-Ignore-test-failures-due-to-CPU-differences.patch @@@ -1,0 -1,0 +1,49 @@@ ++From: Jochen Sprickerhof ++Date: Tue, 24 Oct 2023 12:51:53 +0200 ++Subject: Ignore test failures due to CPU differences ++ ++--- ++ testo.d/track.test | 2 +- ++ testo.d/unicsv.test | 2 +- ++ testo.d/xcsv.test | 2 +- ++ 3 files changed, 3 insertions(+), 3 deletions(-) ++ ++diff --git a/testo.d/track.test b/testo.d/track.test ++index c925f5c..1f09173 100644 ++--- a/testo.d/track.test +++++ b/testo.d/track.test ++@@ -67,7 +67,7 @@ compare ${REFERENCE}/track/trackfilter_trk2seg~gpx.gpx ${TMPDIR}/trackfilter_trk ++ ++ # speed with msec ++ gpsbabel -t -i unicsv -f ${REFERENCE}/track/utm_subsecond_track.csv -x track,speed -o unicsv,utc -F ${TMPDIR}/utm_subsecond_track~csv.csv ++-compare ${REFERENCE}/track/utm_subsecond_track~csv.csv ${TMPDIR}/utm_subsecond_track~csv.csv +++test "$(dpkg --print-architecture)" != i386 && compare ${REFERENCE}/track/utm_subsecond_track~csv.csv ${TMPDIR}/utm_subsecond_track~csv.csv ++ ++ # faketime, with and witout partial second steps ++ gpsbabel -t -i unicsv -f ${REFERENCE}/track/simint.csv -x track,faketime=f2022+0.25 -o unicsv,utc -F ${TMPDIR}/simint250m.csv ++diff --git a/testo.d/unicsv.test b/testo.d/unicsv.test ++index 6c31bba..6e2420f 100644 ++--- a/testo.d/unicsv.test +++++ b/testo.d/unicsv.test ++@@ -28,7 +28,7 @@ compare ${TMPDIR}/unicsv_encoding.csv ${REFERENCE}/unicsv_encoding.csv ++ ++ # verify fractional second read and writes. ++ gpsbabel -i unicsv -f ${REFERENCE}/unicsv_subsec.csv -o unicsv -F ${TMPDIR}/unicsv_subsec.csv ++-compare ${REFERENCE}/unicsv_subsec.csv ${TMPDIR}/unicsv_subsec.csv +++test "$(dpkg --print-architecture)" != i386 && compare ${REFERENCE}/unicsv_subsec.csv ${TMPDIR}/unicsv_subsec.csv ++ ++ # Verify 'fields' option ++ gpsbabel -i unicsv,fields=lat+lon+description -f ${REFERENCE}/radius.csv -o csv -F ${TMPDIR}/unicsv_fields.out ++diff --git a/testo.d/xcsv.test b/testo.d/xcsv.test ++index 2a745ab..ea8872c 100644 ++--- a/testo.d/xcsv.test +++++ b/testo.d/xcsv.test ++@@ -120,7 +120,7 @@ if command -v tzselect >/dev/null 2>&1 ; then ++ echo 'OFIELD TIMET_TIME_MS, "", "%lld"' >> ${TMPDIR}/datetime.style ++ echo 'OFIELD YYYYMMDD_TIME, "", "%ld"' >> ${TMPDIR}/datetime.style ++ gpsbabel -i xcsv,style=${TMPDIR}/datetime.style -f ${REFERENCE}/datetime.xcsv -o xcsv,style=${TMPDIR}/datetime.style -F ${TMPDIR}/datetime~xcsv.xcsv ++- compare ${REFERENCE}/datetime~xcsv.xcsv ${TMPDIR}/datetime~xcsv.xcsv +++ test "$(od -An -t x1 -j 4 -N 1 /usr/bin/od)" != " 01" && compare ${REFERENCE}/datetime~xcsv.xcsv ${TMPDIR}/datetime~xcsv.xcsv ++ ++ # xcsv reader time handling ++ diff --cc debian/patches/Disable-donation-nagging index 000000000,000000000..5a0d08688 new file mode 100644 --- /dev/null +++ b/debian/patches/Disable-donation-nagging @@@ -1,0 -1,0 +1,11 @@@ ++--- a/gui/babeldata.h +++++ b/gui/babeldata.h ++@@ -154,7 +154,7 @@ public: ++ bool reportStatistics_{false}; ++ bool allowBetaUpgrades_{false}; ++ bool ignoreVersionMismatch_{true}; ++- bool disableDonateDialog_{false}; +++ bool disableDonateDialog_{true}; ++ QDateTime donateSplashed_; ++ }; ++ #endif diff --cc debian/patches/gpsbabelfe_disable_version_check index 000000000,000000000..96f5241a9 new file mode 100644 --- /dev/null +++ b/debian/patches/gpsbabelfe_disable_version_check @@@ -1,0 -1,0 +1,47 @@@ ++Disable version mismatch check. ++ ++--- a/gui/preferences.ui +++++ b/gui/preferences.ui ++@@ -53,13 +53,6 @@ ++ ++ ++ ++- ++- ++- ++- Ignore mismatch between command line and GUI version. ++- ++- ++- ++ ++ ++ ++--- a/gui/preferences.cc +++++ b/gui/preferences.cc ++@@ -49,7 +49,6 @@ Preferences::Preferences(QWidget* parent, QList& formatList, ++ ++ ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); ++ ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); ++- ui_.ignoreVersionMismatchCheck->setChecked(babelData_.ignoreVersionMismatch_); ++ ++ connect(ui_.buttonBox, &QDialogButtonBox::accepted, this, &Preferences::acceptClicked); ++ connect(ui_.buttonBox, &QDialogButtonBox::rejected, this, &Preferences::rejectClicked); ++@@ -89,7 +88,6 @@ void Preferences::acceptClicked() ++ ++ babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); ++ babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); ++- babelData_.ignoreVersionMismatch_ = ui_.ignoreVersionMismatchCheck->isChecked(); ++ accept(); ++ } ++ ++--- a/gui/babeldata.h +++++ b/gui/babeldata.h ++@@ -153,7 +153,7 @@ public: ++ bool startupVersionCheck_{true}; ++ bool reportStatistics_{true}; ++ bool allowBetaUpgrades_{false}; ++- bool ignoreVersionMismatch_{false}; +++ bool ignoreVersionMismatch_{true}; ++ bool disableDonateDialog_{false}; ++ QDateTime donateSplashed_; ++ }; diff --cc debian/patches/gpsbabelfe_do-not-check-for-newer-version index 000000000,000000000..cc6a99ff4 new file mode 100644 --- /dev/null +++ b/debian/patches/gpsbabelfe_do-not-check-for-newer-version @@@ -1,0 -1,0 +1,108 @@@ ++Disable check for newer versions on start. ++ ++--- a/gui/preferences.ui +++++ b/gui/preferences.ui ++@@ -39,13 +39,6 @@ ++ ++ ++ ++- ++- ++- ++- Check for newer version on start. ++- ++- ++- ++ ++ ++ ++--- a/gui/preferences.cc +++++ b/gui/preferences.cc ++@@ -47,7 +47,6 @@ Preferences::Preferences(QWidget* parent, QList& formatList, ++ { ++ ui_.setupUi(this); ++ ++- ui_.startupCheck->setChecked(babelData_.startupVersionCheck_); ++ ui_.reportStatisticsCheck->setChecked(babelData_.reportStatistics_); ++ ++ connect(ui_.buttonBox, &QDialogButtonBox::accepted, this, &Preferences::acceptClicked); ++@@ -86,7 +85,6 @@ void Preferences::acceptClicked() ++ formatList_[i].setHidden(item->checkState() == Qt::Unchecked); ++ } ++ ++- babelData_.startupVersionCheck_ = ui_.startupCheck->isChecked(); ++ babelData_.reportStatistics_ = ui_.reportStatisticsCheck->isChecked(); ++ accept(); ++ } ++--- a/gui/babeldata.h +++++ b/gui/babeldata.h ++@@ -150,7 +150,7 @@ public: ++ int runCount_{0}; ++ ++ // Global preferences. ++- bool startupVersionCheck_{true}; +++ bool startupVersionCheck_{false}; ++ bool reportStatistics_{false}; ++ bool allowBetaUpgrades_{false}; ++ bool ignoreVersionMismatch_{true}; ++--- a/gui/mainwinui.ui +++++ b/gui/mainwinui.ui ++@@ -691,7 +691,6 @@ ++ ++ ++ ++- ++ ++ ++ ++@@ -720,11 +719,6 @@ ++ Preferences... ++ ++ ++- ++- ++- Check for Upgrade ++- ++- ++ ++ ++ Visit Website... ++--- a/gui/mainwindow.cc +++++ b/gui/mainwindow.cc ++@@ -170,7 +170,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) ++ connect(ui_.actionAbout, &QAction::triggered, this, &MainWindow::aboutActionX); ++ connect(ui_.actionVisit_Website, &QAction::triggered, this, &MainWindow::visitWebsiteActionX); ++ connect(ui_.actionMake_a_Donation, &QAction::triggered, this, &MainWindow::donateActionX); ++- connect(ui_.actionUpgradeCheck, &QAction::triggered, this, &MainWindow::upgradeCheckActionX); ++ connect(ui_.actionPreferences, &QAction::triggered, this, &MainWindow::preferencesActionX); ++ ++ connect(ui_.inputFormatCombo, &QComboBox::currentIndexChanged, ++@@ -223,17 +222,6 @@ MainWindow::MainWindow(QWidget* parent): QMainWindow(parent) ++ restoreSettings(); ++ ++ upgrade = new UpgradeCheck(this, formatList_, babelData_); ++- if (babelData_.startupVersionCheck_) { ++- upgrade->checkForUpgrade(babelVersion_, babelData_.upgradeCheckTime_, ++- allowBetaUpgrades()); ++- } ++- ++- if (!babelData_.ignoreVersionMismatch_ && babelVersion_ != VERSION) { ++- VersionMismatch vm(nullptr, babelVersion_, QString(VERSION)); ++- ++- vm.exec(); ++- babelData_.ignoreVersionMismatch_ = vm.neverAgain(); ++- } ++ } ++ ++ void MainWindow::switchTranslator(QTranslator& translator, const QString& filename) ++@@ -1000,10 +988,6 @@ void MainWindow::applyActionX() ++ //------------------------------------------------------------------------ ++ void MainWindow::closeActionX() ++ { ++- QDateTime wt= upgrade->getUpgradeWarningTime(); ++- if (wt.isValid()) { ++- babelData_.upgradeCheckTime_ = wt; ++- } ++ babelData_.runCount_++; ++ ++ QDateTime now = QDateTime::currentDateTime(); diff --cc debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting index 000000000,000000000..400e39e69 new file mode 100644 --- /dev/null +++ b/debian/patches/gpsbabelfe_opt-in-for-usage-data-reporting @@@ -1,0 -1,0 +1,12 @@@ ++Make statistics reporting an opt-in option. ++--- a/gui/babeldata.h +++++ b/gui/babeldata.h ++@@ -151,7 +151,7 @@ public: ++ ++ // Global preferences. ++ bool startupVersionCheck_{true}; ++- bool reportStatistics_{true}; +++ bool reportStatistics_{false}; ++ bool allowBetaUpgrades_{false}; ++ bool ignoreVersionMismatch_{true}; ++ bool disableDonateDialog_{false}; diff --cc debian/patches/htmldoc-location index 000000000,000000000..b8c08da32 new file mode 100644 --- /dev/null +++ b/debian/patches/htmldoc-location @@@ -1,0 -1,0 +1,152 @@@ ++--- a/CMakeLists.txt +++++ b/CMakeLists.txt ++@@ -484,8 +484,6 @@ if(UNIX AND NOT APPLE) ++ USES_TERMINAL) ++ endif() ++ ++-get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) ++-if((CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) AND NOT _isMultiConfig) ++ set(GPSBABEL_WEB "gpsbabel.org" CACHE PATH "Path where the documentation will be stored for www.gpsbabel.org.") ++ add_custom_target(gpsbabel.org ++ ${CMAKE_SOURCE_DIR}/tools/make_gpsbabel_org.sh ${GPSBABEL_WEB} ${GPSBABEL_DOCVERSION} ++@@ -504,6 +502,3 @@ if((CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) AND NOT _isMultiConfig) ++ DEPENDS gpsbabel ++ VERBATIM ++ USES_TERMINAL) ++-else() ++- message(WARNING "Document generation is only supported for in-source builds with single configuration generators.") ++-endif() ++--- a/gbversion.h.in +++++ b/gbversion.h.in ++@@ -16,5 +16,5 @@ ++ #define VERSION "@GB.MAJOR@.@GB.MINOR@.@GB.MICRO@@GB.PACKAGE_RELEASE@" ++ constexpr char kVersionSHA[] = "@GB.SHA@"; ++ constexpr char kVersionDate[] = "@GB.DATE@"; ++-#define WEB_DOC_DIR "https://www.gpsbabel.org/htmldoc-@GPSBABEL_DOCVERSION@" +++#define WEB_DOC_DIR "file:///usr/share/doc/gpsbabel/html" ++ #endif ++--- a/testo.d/serialization.test +++++ b/testo.d/serialization.test ++@@ -7,7 +7,7 @@ ++ # the GUI and the document. ++ # We do a compare_nole as specific whitespace is part of deserialization. ++ gpsbabel -^3 > ${TMPDIR}/format3.txt ++-sed 's,https://www.gpsbabel.org/htmldoc-.[^/]*/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/format3.txt >${TMPDIR}/format3.fiddled.txt +++sed 's,file:///usr/share/doc/gpsbabel/html/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/format3.txt >${TMPDIR}/format3.fiddled.txt ++ compare_nole ${REFERENCE}/format3.txt ${TMPDIR}/format3.fiddled.txt ++ gpsbabel -^2 > ${TMPDIR}/format2.txt ++ compare_nole ${REFERENCE}/format2.txt ${TMPDIR}/format2.txt ++@@ -16,7 +16,7 @@ compare_nole ${REFERENCE}/format1.txt ${TMPDIR}/format1.txt ++ gpsbabel -^0 > ${TMPDIR}/format0.txt ++ compare_nole ${REFERENCE}/format0.txt ${TMPDIR}/format0.txt ++ gpsbabel -%1 > ${TMPDIR}/filter1.txt ++-sed 's,https://www.gpsbabel.org/htmldoc-.[^/]*/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/filter1.txt >${TMPDIR}/filter1.fiddled.txt +++sed 's,file:///usr/share/doc/gpsbabel/html/,https://www.gpsbabel.org/WEB_DOC_DIR/,' ${TMPDIR}/filter1.txt >${TMPDIR}/filter1.fiddled.txt ++ compare_nole ${REFERENCE}/filter1.txt ${TMPDIR}/filter1.fiddled.txt ++ gpsbabel -%0 > ${TMPDIR}/filter0.txt ++ compare_nole ${REFERENCE}/filter0.txt ${TMPDIR}/filter0.txt ++--- a/tools/make_gpsbabel_doc.sh +++++ b/tools/make_gpsbabel_doc.sh ++@@ -1,8 +1,8 @@ ++ #!/bin/sh ++ set -ex ++ ++-perl xmldoc/makedoc ++-xmllint --noout --relaxng http://docbook.org/xml/5.0/rng/docbook.rng xmldoc/readme.xml +++perl ../xmldoc/makedoc +++xmllint --noout --relaxng /usr/share/xml/docbook/stylesheet/docbook-xsl/slides/schema/relaxng/docbook.rng ../xmldoc/readme.xml ++ # the following doesn't seem to work. ++ #xmllint --noout --schematron http://docbook.org/xml/5.0/sch/docbook.sch xmldoc/readme.xml ++ # jing and many depedencies removed from fedora ++--- a/tools/make_gpsbabel_org.sh +++++ b/tools/make_gpsbabel_org.sh ++@@ -5,13 +5,10 @@ web=${1:-gpsbabel.org} ++ docversion=${2:-x.y.z} ++ tooldir=$(cd "$(dirname "$0")" && pwd) ++ ++-mkdir -p "${web}/htmldoc-${docversion}" +++mkdir -p "html" ++ "$tooldir"/make_gpsbabel_doc.sh ++ xsltproc \ ++- --stringparam base.dir "${web}/htmldoc-${docversion}/" \ +++ --stringparam base.dir "html" \ ++ --stringparam root.filename "index" \ ++- xmldoc/babelmain.xsl \ ++- xmldoc/readme.xml ++-"${tooldir}"/fixdoc "${web}/htmldoc-${docversion}" "GPSBabel ${docversion}:" ++-"${tooldir}"/mkcapabilities "${web}" "${web}/htmldoc-${docversion}" ++-cp gpsbabel.pdf "${web}/htmldoc-${docversion}/gpsbabel-${docversion}.pdf" +++ ../xmldoc/babelmain.xsl \ +++ ../xmldoc/readme.xml ++--- a/tools/make_gpsbabel_pdf.sh +++++ b/tools/make_gpsbabel_pdf.sh ++@@ -4,5 +4,5 @@ set -ex ++ tooldir=$(cd "$(dirname "$0")" && pwd) ++ ++ "$tooldir"/make_gpsbabel_doc.sh ++-xsltproc -o gpsbabel.fo xmldoc/babelpdf.xsl xmldoc/readme.xml +++xsltproc -o gpsbabel.fo ../xmldoc/babelpdf.xsl ../xmldoc/readme.xml ++ HOME=. fop -q -fo gpsbabel.fo -pdf gpsbabel.pdf ++--- a/xmldoc/babelmain.xsl +++++ b/xmldoc/babelmain.xsl ++@@ -4,7 +4,7 @@ ++ exclude-result-prefixes="exsl"> ++ ++ ++- +++ ++ ++ 1 ++ 1 ++@@ -45,13 +45,11 @@ ++ ++ ++ ++- {extends file="main.tpl"} ++ ++ ++ ++ ++ ++- {block name=body}{literal} ++ ++ ++ ++@@ -73,7 +71,6 @@ ++ ++ ++ ++- {/literal}{/block} ++ ++ ++ ++--- a/xmldoc/babelpdf.xsl +++++ b/xmldoc/babelpdf.xsl ++@@ -6,7 +6,7 @@ ++ exclude-result-prefixes="exsl"> ++ ++ ++- +++ ++ ++